Auto merge of #4062 - huntiep:master, r=alexcrichton
authorbors <bors@rust-lang.org>
Wed, 7 Jun 2017 16:37:40 +0000 (16:37 +0000)
committerbors <bors@rust-lang.org>
Wed, 7 Jun 2017 16:37:40 +0000 (16:37 +0000)
commit678423217d1cb60df11bbc738b858267e9218b62
tree0b00e0cc2794edbf6c330dfe5945c0b94b3e09de
parentceb23c46f99882da1d7a0694aebbbc944280829c
parentfe5a875efde0c14414acc0f9cf15d487accd7c50
Auto merge of #4062 - huntiep:master, r=alexcrichton

Load local git name/email for cargo init

Fixes #3920
src/cargo/ops/cargo_new.rs
tests/new.rs